Merge pull request #102 from zonuexe/master
authorJustin Burkett <justin@burkett.cc>
Sat, 13 Feb 2016 14:54:50 +0000 (09:54 -0500)
committerJustin Burkett <justin@burkett.cc>
Sat, 13 Feb 2016 14:54:50 +0000 (09:54 -0500)
Disable show-trailing-whitespace


Trivial merge